cleaning

[RRRRHHHH_Code] / ruralHouses client / src / gui / ModifyOfferGUI.java

diff --git a/ruralHouses client/src/gui/ModifyOfferGUI.java b/ruralHouses client/src/gui/ModifyOfferGUI.java
index 9259130..d5422bf 100644 (file)
--- a/ruralHouses client/src/gui/ModifyOfferGUI.java
+++ b/ruralHouses client/src/gui/ModifyOfferGUI.java
@@ -75,7 +75,6 @@ public class ModifyOfferGUI extends JFrame {
                this.setSize(new Dimension(513, 433));
                this.setTitle("Set availability");
 
-<<<<<<< HEAD
 
                try {
                        om = (OfferInterface) Naming
@@ -91,8 +90,7 @@ public class ModifyOfferGUI extends JFrame {
                } catch (RemoteException e1) {
                        e1.printStackTrace();
                }
-=======
->>>>>>> 25898b619dd708c9f15a44200b545cac11404b73
+
                
                jComboBox1 = new JComboBox<RuralHouse>(Hlist);